More widget gallery.

diff --git a/ChangeLog b/ChangeLog
index 24c0d64608864693597ae90371926fc6d66c6b6f..db255a468ce73a02c97ce7b9c3a61a612fa00d2d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
 
-       * docs/tools/widgets.c: Create scrolledwindow and statusbar 
-       images.
+       * docs/tools/widgets.c: Create scrolledwindow, statusbar, 
+       scale and image images. 
 
 2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 24c0d64608864693597ae90371926fc6d66c6b6f..db255a468ce73a02c97ce7b9c3a61a612fa00d2d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,7 +1,7 @@
 2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
 
-       * docs/tools/widgets.c: Create scrolledwindow and statusbar 
-       images.
+       * docs/tools/widgets.c: Create scrolledwindow, statusbar, 
+       scale and image images. 
 
 2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 24c0d64608864693597ae90371926fc6d66c6b6f..db255a468ce73a02c97ce7b9c3a61a612fa00d2d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,7 +1,7 @@
 2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
 
-       * docs/tools/widgets.c: Create scrolledwindow and statusbar 
-       images.
+       * docs/tools/widgets.c: Create scrolledwindow, statusbar, 
+       scale and image images. 
 
 2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 24c0d64608864693597ae90371926fc6d66c6b6f..db255a468ce73a02c97ce7b9c3a61a612fa00d2d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,7 +1,7 @@
 2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
 
-       * docs/tools/widgets.c: Create scrolledwindow and statusbar 
-       images.
+       * docs/tools/widgets.c: Create scrolledwindow, statusbar, 
+       scale and image images. 
 
 2004-10-10  Matthias Clasen  <matthias@localhost.localdomain>
 

diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 9e8e81b9a70707d667696d0ff692f8f438983833..b167945b9311dbc46d08efa0c83bc84819aceff2 100644 (file)
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,9 +1,12 @@
 2004-10-11  Matthias Clasen  <matthias@localhost.localdomain>
 
-       * gtk/images/statusbar.png: New image.
+       * gtk/images/image.png:
+       * gtk/images/scales.png:
+       * gtk/images/statusbar.png: New images.
 
        * gtk/visual_index.xml:
-       * gtk/Makefile.am (HTML_IMAGES): Add statusbar image.
+       * gtk/Makefile.am (HTML_IMAGES): Add statusbar, scale 
+       and image images.
 
 2004-10-11  Matthias Clasen  <mclasen@redhat.com>
 

diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
index fd8ab8e83f61ad1da02d9b11beca5846b3985f47..52b66bf38a68cba58c0ae6ca2cc33d59518cedd0 100644 (file)
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -227,6 +227,7 @@ HTML_IMAGES = \
        $(srcdir)/images/scrolledwindow.png                             \
        $(srcdir)/images/spinbutton.png                                 \
        $(srcdir)/images/statusbar.png                                  \
+       $(srcdir)/images/image.png                                      \
        $(srcdir)/images/messagedialog.png
 
 # Extra options to supply to gtkdoc-fixref

diff --git a/docs/reference/gtk/images/image.png b/docs/reference/gtk/images/image.png
new file mode 100644 (file)
index 0000000..3200e6b
Binary files /dev/null and b/docs/reference/gtk/images/image.png differ

diff --git a/docs/reference/gtk/images/scales.png b/docs/reference/gtk/images/scales.png
new file mode 100644 (file)
index 0000000..3a54373
Binary files /dev/null and b/docs/reference/gtk/images/scales.png differ

diff --git a/docs/reference/gtk/visual_index.xml b/docs/reference/gtk/visual_index.xml
index a57843ff42b57c163c3cf387b422419c82d585a8..7d9dd3978246c66c6f2f8e5d00bf24df06364c51 100644 (file)
--- a/docs/reference/gtk/visual_index.xml
+++ b/docs/reference/gtk/visual_index.xml
@@ -77,4 +77,10 @@
   <link linkend="GtkStatusbar">
     <inlinegraphic fileref="statusbar.png" format="PNG"></inlinegraphic>
   </link>
+  <link linkend="GtkScale">
+    <inlinegraphic fileref="scales.png" format="PNG"></inlinegraphic>
+  </link>
+  <link linkend="GtkImage">
+    <inlinegraphic fileref="image.png" format="PNG"></inlinegraphic>
+  </link>
 </para>

diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 9062d3b4d74c52400eef506056bd19aa7a377e0b..cff1b15c979f6c87d2d11f4d71875e240a891f37 100644 (file)
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -598,6 +598,49 @@ create_statusbar (void)
   return new_widget_info ("statusbar", vbox, SMALL);
 }
 
+static WidgetInfo *
+create_scales (void)
+{
+  GtkWidget *hbox;
+  GtkWidget *vbox;
+
+  vbox = gtk_vbox_new (FALSE, 3);
+  hbox = gtk_hbox_new (TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox),
+                     gtk_hscale_new_with_range (0.0, 100.0, 1.0),
+                     TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox),
+                     gtk_vscale_new_with_range (0.0, 100.0, 1.0),
+                     TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox),
+                     g_object_new (GTK_TYPE_LABEL,
+                                   "label", "Horizontal and Vertical\nScales",
+                                   "justify", GTK_JUSTIFY_CENTER,
+                                   NULL),
+                     FALSE, FALSE, 0);
+  return new_widget_info ("scales", vbox, MEDIUM);}
+
+static WidgetInfo *
+create_image (void)
+{
+  GtkWidget *widget;
+  GtkWidget *align, *vbox;
+
+  widget = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING, 
+                                    GTK_ICON_SIZE_DND);
+
+  vbox = gtk_vbox_new (FALSE, 3);
+  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox),
+                     gtk_label_new ("Image"),
+                     FALSE, FALSE, 0);
+
+  return new_widget_info ("image", vbox, SMALL);
+}
+
 GList *
 get_all_widgets (void)
 {
@@ -629,6 +672,8 @@ get_all_widgets (void)
   retval = g_list_prepend (retval, create_scrolledwindow ());
   retval = g_list_prepend (retval, create_spinbutton ());
   retval = g_list_prepend (retval, create_statusbar ());
+  retval = g_list_prepend (retval, create_scales ());
+  retval = g_list_prepend (retval, create_image ());
 
   return retval;
 }